stylecontext: Use correct parent style for lookups

After 3a337156d11a86c7a88f1f30a09276fdf6f63008 style lookups still used
the parent context's style as the parent style, even though after a
gtk_style_context_save() the root style of the style context is the
proper parent.

Testcase attached.

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 2b34d0d2e7d2499802e2a2cc97681239cf08666c..c7c39f86539061488127fb87acb7b2c9e7375c67 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -652,8 +652,9 @@ gtk_style_context_is_saved (GtkStyleContext *context)
 }
 
 static GtkWidgetPath *
-create_query_path (GtkStyleContext             *context,
-                   const GtkCssNodeDeclaration *decl)
+create_query_path (GtkStyleContext              *context,
+                   const GtkCssNodeDeclaration  *decl,
+                   GtkCssStyle                 **out_parent)
 {
   GtkStyleContextPrivate *priv;
   GtkWidgetPath *path;
@@ -671,11 +672,13 @@ create_query_path (GtkStyleContext             *context,
 
       gtk_widget_path_append_type (path, length > 0 ? gtk_widget_path_iter_get_object_type (path, length - 1) : G_TYPE_NONE);
       gtk_css_node_declaration_add_to_widget_path (decl, path, length);
+      *out_parent = root->values;
     }
   else
     {
       if (length > 0)
         gtk_css_node_declaration_add_to_widget_path (decl, path, length - 1);
+      *out_parent = priv->parent ? style_values_lookup (priv->parent) : NULL;
     }
 
   return path;
@@ -690,11 +693,11 @@ update_properties (GtkStyleContext             *context,
   GtkStyleContextPrivate *priv;
   GtkCssMatcher matcher;
   GtkWidgetPath *path;
-  GtkCssStyle *result;
+  GtkCssStyle *result, *parent;
 
   priv = context->priv;
 
-  path = create_query_path (context, decl);
+  path = create_query_path (context, decl, &parent);
 
   if (!_gtk_css_matcher_init (&matcher, path))
     {
@@ -706,7 +709,7 @@ update_properties (GtkStyleContext             *context,
                                             GTK_STYLE_PROVIDER_PRIVATE (priv->cascade),
                                             &matcher,
                                             priv->scale,
-                                            priv->parent ? style_values_lookup (priv->parent) : NULL);
+                                            parent);
 
   gtk_widget_path_free (path);
 
@@ -721,23 +724,23 @@ build_properties (GtkStyleContext             *context,
   GtkStyleContextPrivate *priv;
   GtkCssMatcher matcher;
   GtkWidgetPath *path;
-  GtkCssStyle *style;
+  GtkCssStyle *style, *parent;
 
   priv = context->priv;
 
-  path = create_query_path (context, decl);
+  path = create_query_path (context, decl, &parent);
 
   if (_gtk_css_matcher_init (&matcher, path))
     style = gtk_css_static_style_new_compute (GTK_STYLE_PROVIDER_PRIVATE (priv->cascade),
                                               &matcher,
                                               priv->scale,
-                                              priv->parent ? style_values_lookup (priv->parent) : NULL,
+                                              parent,
                                               out_change);
   else
     style = gtk_css_static_style_new_compute (GTK_STYLE_PROVIDER_PRIVATE (priv->cascade),
                                               NULL,
                                               priv->scale,
-                                              priv->parent ? style_values_lookup (priv->parent) : NULL,
+                                              parent,
                                               out_change);
 
   gtk_widget_path_free (path);
@@ -1500,6 +1503,11 @@ gtk_style_context_save (GtkStyleContext *context)
 
   priv = context->priv;
 
+  /* Make sure we have the style existing. It is the
+   * parent of the new saved node after all. */
+  if (!gtk_style_context_is_saved (context))
+    style_values_lookup (context);
+
   priv->saved_nodes = g_slist_prepend (priv->saved_nodes, priv->info);
 
   priv->info = style_info_copy (priv->info);

diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index b4b2bc89f76d21d4a62e2350c3a69ecbb79eb570..1577dade4b8aa20d4744d554dc7fa9f0e72edd5b 100644 (file)
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -397,6 +397,9 @@ testdata = \
        sizegroups-get-preferred-null.ref.ui \
        statusbar-remove-all.ref.ui \
        statusbar-remove-all.ui \
+       style-context-save-inheritance.css \
+       style-context-save-inheritance.ref.ui \
+       style-context-save-inheritance.ui \
        style-properties-nth-child.css \
        style-properties-nth-child.ref.ui \
        style-properties-nth-child.ui \

diff --git a/testsuite/reftests/style-context-save-inheritance.css b/testsuite/reftests/style-context-save-inheritance.css
new file mode 100644 (file)
index 0000000..3f3630c
--- /dev/null
+++ b/testsuite/reftests/style-context-save-inheritance.css
@@ -0,0 +1,18 @@
+@import "reset-to-defaults.css";
+
+.background {
+  color: red;
+}
+
+GtkLabel {
+  color: green;
+}
+
+GtkLabel:link,
+GtkLabel:visited {
+  color: inherit;
+}
+
+#reference, #reference * {
+  color: green;
+}

diff --git a/testsuite/reftests/style-context-save-inheritance.ref.ui b/testsuite/reftests/style-context-save-inheritance.ref.ui
new file mode 100644 (file)
index 0000000..09b5af5
--- /dev/null
+++ b/testsuite/reftests/style-context-save-inheritance.ref.ui
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
+<interface>
+  <requires lib="gtk+" version="3.12"/>
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+    <child>
+      <object class="GtkLabel" id="label1">
+        <property name="name">reference</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">GREEN
+&lt;a href="http://www.gtk.org"&gt;GREEN&lt;/a&gt;</property>
+        <property name="use_markup">True</property>
+      </object>
+    </child>
+  </object>
+</interface>

diff --git a/testsuite/reftests/style-context-save-inheritance.ui b/testsuite/reftests/style-context-save-inheritance.ui
new file mode 100644 (file)
index 0000000..022033b
--- /dev/null
+++ b/testsuite/reftests/style-context-save-inheritance.ui
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
+<interface>
+  <requires lib="gtk+" version="3.12"/>
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+    <child>
+      <object class="GtkLabel" id="label1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">GREEN
+&lt;a href="http://www.gtk.org"&gt;GREEN&lt;/a&gt;</property>
+        <property name="use_markup">True</property>
+      </object>
+    </child>
+  </object>
+</interface>